2cef4e5e6f2fdef94d8509be6b37cf7cb9505cad,src/java/com/mockey/ui/ConflictHelper.java,ConflictHelper,getConflictInfo,#List#,54

Before Change


				if (!serviceA.getId().equals(serviceB.getId())) {

					// NAME
					if (serviceA.getServiceName().equals(
							serviceB.getServiceName())) {
						conflictInfo
								.addConflict(serviceA, serviceB, MATCH_NAME);

After Change


				if (!serviceA.getId().equals(serviceB.getId())) {

					// NAME
					if (MockeyXmlFileManager.getSafeForFileSystemName(serviceA.getServiceName()).equals(
							MockeyXmlFileManager.getSafeForFileSystemName(serviceB.getServiceName()))) {
						conflictInfo.addConflict(serviceA, serviceB, "Service with name'" + serviceA.getServiceName()
								+ "' compared to service with name: '" + serviceB.getServiceName() + "'. Info: " + MATCH_NAME);